Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 18 May 2010 11:35:42 +0000 (11:35 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 18 May 2010 11:35:42 +0000 (11:35 +0000)
commita754a34b6eac0156eed8c777a42026e25772ce25
tree5dec84f2c48f79b7dc223ca9b018b7f5bbe5946b
parentc997048a772d73e571990cf4b9b27363a97a3106
parent828afd253993abf5ef86b89a679a5f734fb27d6c
Merge from mainline.